gdk/directfb/gdkcolor-directfb.c small clean ups include order

gdk/directfb/gdkwindow-directfb.c fixed beep compile error
gdk/directfb/Makefile.am removed GDK_PIXBUF_DISABLE_DEPRECATED
     GDK_DISABLE_DEPRECATED to allow compile per Behdad
gdk/quartz/Makefile.am same change as directfb Makefile
gtk/Makefile.am fixed typo that cause socket stubs not to compile

diff --git a/ChangeLog b/ChangeLog
index a854756c452c2d594cea047d1abcf9e5e721a7c2..3d05c276ea853e1c094a0f93e15accdd0a9c17ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-09-13 Michael Emmel <mike.emmel@gmail.com>
+
+       * gdk/directfb/gdkcolor-directfb.c small clean ups include order
+       * gdk/directfb/gdkwindow-directfb.c fixed beep compile error
+       * gdk/directfb/Makefile.am removed GDK_PIXBUF_DISABLE_DEPRECATED
+               GDK_DISABLE_DEPRECATED to allow compile per Behdad
+       * gdk/quartz/Makefile.am same change as directfb Makefile
+       * gtk/Makefile.am fixed typo that cause socket stubs not to compile
+
 2006-09-13 Matthias Clasen <mclasen@redhat.com>
 
        * gtk/gtkcolorsel.c: Use a GtkWindow instead of a GtkInvisible

diff --git a/gdk/directfb/Makefile.am b/gdk/directfb/Makefile.am
index 97a2498dac634c8d2b1ee7bf6c48f825ed4d5688..3c2ec45027715c83fe17e8ec1973afcbde071c62 100644 (file)
--- a/gdk/directfb/Makefile.am
+++ b/gdk/directfb/Makefile.am
@@ -4,12 +4,11 @@ libgdkincludedir = $(includedir)/gtk-2.0/gdk
 
 INCLUDES =             \
        -DG_LOG_DOMAIN=\"Gdk-DirectFB\" \
+       -DGDK_COMPILATION \
        -I$(top_srcdir)                 \
        -I$(top_srcdir)/gdk             \
        -I$(top_builddir)/gdk           \
        -DG_DISABLE_DEPRECATED          \
-       -DGDK_PIXBUF_DISABLE_DEPRECATED \
-       -DGDK_DISABLE_DEPRECATED        \
        @GTK_DEBUG_FLAGS@               \
        @GDK_DEP_CFLAGS@                
 

diff --git a/gdk/directfb/gdkcolor-directfb.c b/gdk/directfb/gdkcolor-directfb.c
index 69a9db7e44588cb317a17fb1b73bcae1942be531..6c98f76a7ed719a397b8c60d4e098a6f2d48ea97 100644 (file)
--- a/gdk/directfb/gdkcolor-directfb.c
+++ b/gdk/directfb/gdkcolor-directfb.c
@@ -38,12 +38,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "gdkcolor.h"
+#include "gdkinternals.h"
 #include "gdkdirectfb.h"
 #include "gdkprivate-directfb.h"
-
-#include "gdkinternals.h"
-
-#include "gdkcolor.h"
 #include "gdkalias.h"
 
 
@@ -618,6 +616,5 @@ gdk_directfb_allocate_color_key (GdkColormap *colormap)
 
   private->info[255].ref_count++;
 }
-
 #define __GDK_COLOR_X11_C__
 #include "gdkaliasdef.c"

diff --git a/gdk/directfb/gdkwindow-directfb.c b/gdk/directfb/gdkwindow-directfb.c
index a374400b325858d03664fe5ac9f1e3649b0cef00..ffa11e9838d177ff69f8a13a0a56ed179b8128e6 100644 (file)
--- a/gdk/directfb/gdkwindow-directfb.c
+++ b/gdk/directfb/gdkwindow-directfb.c
@@ -2993,7 +2993,7 @@ gdk_window_impl_directfb_paintable_init (GdkPaintableIface *iface)
 void
 gdk_window_beep (GdkWindow *window)
 {
-  gdk_display_beep (GDK_WINDOW_DISPLAY (window));
+  gdk_display_beep (gdk_display_get_default());
 }
 
 #define __GDK_WINDOW_X11_C__